how to resolve merge conflict in vs code

welcome to shbcf.ru